Auto merge of #1161 - alexcrichton:issue-1159, r=huonw
authorbors <bors@rust-lang.org>
Tue, 13 Jan 2015 21:09:13 +0000 (21:09 +0000)
committerbors <bors@rust-lang.org>
Tue, 13 Jan 2015 21:09:13 +0000 (21:09 +0000)
commitac6da631860575ef4ca07ad94fb1341c440cc97b
tree63dd0500421acd650adc7e466ea6b39fb2af0410
parentb6afc819db9ebc250ddb36d8b62438c838dd0f95
parentf310bce6bf07411ec48dbc699f6e0024a74b1e80
Auto merge of #1161 - alexcrichton:issue-1159, r=huonw

Looks like these got tweaked from the compiler...

Closes #1159